d/control: relax dependency on dcmtk-data. Closes: #1098944

diff --git a/debian/control b/debian/control
index d9ca3d0fc328cd441dc81e61b4c59dfa6b131be3..fa8eaed3fc425ebed23c305b2aac0a5326aac427 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Description: OFFIS DICOM toolkit data files
 Package: libdcmtk19
 Architecture: any
 Section: libs
-Depends: dcmtk-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: dcmtk-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Multi-Arch: same
 Description: OFFIS DICOM toolkit runtime libraries
  DCMTK includes a collection of libraries and applications for examining,

diff --git a/debian/dcmtk-data.install b/debian/dcmtk-data.install
index 91277687c5ee86b63dc46cea4d6be3300c4fef05..7045a5595879a074668cee1e08ed89c6935a36b8 100644 (file)
--- a/debian/dcmtk-data.install
+++ b/debian/dcmtk-data.install
@@ -1,3 +1,3 @@
-usr/share/dcmtk-3.6.9/*.dic
-usr/share/dcmtk-3.6.9/csmapper/
-usr/share/dcmtk-3.6.9/esdb/
+usr/share/dcmtk/*.dic
+usr/share/dcmtk/csmapper/
+usr/share/dcmtk/esdb/

diff --git a/debian/dcmtk.examples b/debian/dcmtk.examples
index 6c84575f3a4785932854e1b29dbff8d0208eb4ca..253157005d3b415ef7105628dafd4ed41a4ca00e 100644 (file)
--- a/debian/dcmtk.examples
+++ b/debian/dcmtk.examples
@@ -1,2 +1,2 @@
-usr/share/dcmtk-3.6.9/wlistdb
-usr/share/dcmtk-3.6.9/wlistqry
+usr/share/dcmtk/wlistdb
+usr/share/dcmtk/wlistqry

diff --git a/debian/dcmtk.install b/debian/dcmtk.install
index 03a21b417b6686f12177c46c3c244dda5569517a..3867465e680ea4300436714027b69e22bd18a67e 100644 (file)
--- a/debian/dcmtk.install
+++ b/debian/dcmtk.install
@@ -1,8 +1,8 @@
 etc/dcmtk/*
 usr/bin/*
-usr/share/dcmtk-3.6.9/*.css
-usr/share/dcmtk-3.6.9/*.dump
-usr/share/dcmtk-3.6.9/*.lut
-usr/share/dcmtk-3.6.9/dcm2xml.dtd
-usr/share/dcmtk-3.6.9/dsr2xml.xsd
-usr/share/dcmtk-3.6.9/dumppat.txt
+usr/share/dcmtk/*.css
+usr/share/dcmtk/*.dump
+usr/share/dcmtk/*.lut
+usr/share/dcmtk/dcm2xml.dtd
+usr/share/dcmtk/dsr2xml.xsd
+usr/share/dcmtk/dumppat.txt

diff --git a/debian/patches/remove_version.patch b/debian/patches/remove_version.patch
index 096ae1d8b3546a593b692ade69c4b1c645cf1020..05faf03a28893343110091f919e49114002054e6 100644 (file)
--- a/debian/patches/remove_version.patch
+++ b/debian/patches/remove_version.patch
@@ -1,19 +1,22 @@
 Description: Remove version
 Author: Mathieu Malaterre <malat@debian.org>
 Forwarded: not-needed
-Last-Update: 2023-11-06
+Bug-Debian: https://bugs.debian.org/1098944
+Last-Update: 2025-03-21
 
 
 Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake
 ===================================================================
 --- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake
 +++ dcmtk/CMake/GenerateDCMTKConfigure.cmake
-@@ -195,7 +195,7 @@ else()
+@@ -195,8 +195,8 @@ else()
  
    # Modify the installation paths for configuration files, data files and documents
    # by adding a subdirectory with the DCMTK name and version number
 -  set(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
+-  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
 +  set(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/dcmtk")
-   set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
++  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk")
    set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
  
+   # These variables are defined as macros in osconfig.h and must end with a path separator

diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index 2874c778c59181094c3d28e9f244521f6a32a8c0..97dcb12636f2d82cffff3bfd873e776bd9d237a3 100644 (file)
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -13,7 +13,7 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
 fi
 
 cp -a /usr/lib/python3/dist-packages/pydicom/data/test_files/CT_small.dcm "${AUTOPKGTEST_TMP}"
-cp -a /usr/share/dcmtk-3.6.9/dicom.dic "${AUTOPKGTEST_TMP}"
+cp -a /usr/share/dcmtk/dicom.dic "${AUTOPKGTEST_TMP}"
 
 
 export DCMDICTPATH=${AUTOPKGTEST_TMP}/dicom.dic